dbm/WIP: Bits pass test, still incomplete