WIP Server
Java OWNED the API
Fix server
Merge remote-tracking branch 'origin/server'