Added stuff
More stuff
Worked out the client a little