Glad you have a grasp on this now. But do remember, the only stupid question is the one you didn't ask. So if in doubt, by all means ask!
Now I myself am not knowledgeable on 1031 exchanges. But since that was done years ago the cost basis was determined at that time. So reporting the sale now really shouldn't be any different from a "normal" purchase style acquisition.
