Client controller

#1) Merge me into Master, dammit!