WIP: debug (tests still don't pass...)