Refactors to run on one server