Merge API into Server to simplify forking/branching across API and Implementation
Merge API into Server to simplify forking/branching across API and Implementation