refactoring in progress
refactoring exceptions
Catch up with new api names on server