Server API brought up to date with Client

Huge push of changes - items mostly.