all tests pass now. FUCK YEH