working on moving to server.
cleaning up.