WIP: changes to tenon-ify it