fixed lint errors
Merged stuff.
started work on server test and realized can't serve anything