Final commit of Sunday 4/13

Committing updated app. Still need to work on conversations piece.