Splitting it all out and a new server
A working version at last