Moved some of the forces to a new class