Refactored proto code out

Shouldn't have merged it in the first place
Hacked together the client