Controller, model, and views have now been separated and just need to be cleaned up a bit