Moved code to Model and added data for weeks