Working towards handling multiple apps.
Functional single app.
Merge branch '1.0-unstable1'

Bringing everything up to date.