Made movement work for the client.

Also, dialyzer is happy with me now.