Client controller

Merge me into Master, dammit!