WIP: tests passing with stack