Added more listeners started added new activities.  Will have to refactor as soon as I figure out how to.