Added server stuff.
merge?
Got it to work i think?