broke the shit out of status, but fixed it, all tests passing
fix merge conflicts;