Fully Working App

Pushing while this is functional - restore from here in case this blows
up.