Reorganizing

Added some extra comments to organize things. Added beginning formatting
for a menu.