General code tidy up
Started adding a little bit of data