Pretty much done with app, got to add tests