Some changes, Server now works somewhat!