Finished basic functionality of app