Cleaned up the app file
Working on universities
Further database commits
Got query working