Add TODOs
More accurately describe what we're doing
Declare the data structure using an XML mapper instead