Made some progress. Model/View currently working