App essentially done, moving on to unit testing