WIP ENH: Closer to working