Working version of app so far