Start cleaning up the messy code! A lot to do