#22 Clean up the parser
#9 Icons, icons, icons