Commit completed part of app to branch 1

Commit completed part of app to branch 1 to deal with conflicts in
merging