movements, refactored server to be a dep