Client dev

AM I doing this right? I committed, pushed, and now creating a pull request here.. Sorry for not being git ofey.. :/