Wrap API calls
Improve tests
Change email validation
Dont mangle at min