Use Links inner class to hold links
Reordered TODOs