Restarted project, cleaned things up and added second activity