App updates

Implementing most of Issue#15