Feat/data models

Making the UI all pretty and stuff