switch api and api_calls, allow people to be created
fix merge conflicts