Commented out the interface stuff so that the app starts

- Just put most of the stuff in OnCreate in comments so that the App
starts
- Some leftover-merging