Added server support
Merged the server stuffz and added the enter button