velocitator doing too much, add base class and start to refactor out