Merge api services, etc, back into this project