At a point where it's compiling

Had to add a couple temporary build.gradle files, will get overwritten
when merging with other branches
Merging user-interface branch onto master