Super-WIP logic commit