wip - resurrecting client app code :)