App to master merge

Basic to push app changes to master