added server
fixed some errors with cleaning
cleaned up, prep for base templating