Messy commit.
More utility methods.
Modifications to entities.
Update MovidaClient + MovidaService.