Dev

Semi working app. Good place to pull into master.