Complete App Update

First Draft Complete