Ready for changing to database model
Finished model module
Working version