WIP on fixing customer model and API view