Adding data model Tidying up some code

imports, archiving ect.