This should be its own branch: Reverting "Pulling in old code from the Tapp client project. Everything is broken, but it's a start."

This reverts commit ca65ec3790bfbc7e01ade47dd5ac570432f730ad.