NEW: server parts

some reworked parts of the server