woah a lot of stuff
merged
added server file