removed all the testing stuff and rewrote the server