initial server stuff
merge fix