Working on server

Pretty bug free...