all tests passing now, yay