Pulling in old code from the Tapp client project. Everything is broken, but it's a start.