flipped the hierarchy of mass and fixed mass, unbroke some of the forces.
in process of removing duplicated code and making forces work again