Finish the server remake, all the base rework