About 20% complete with major clean up process for block/item naming and
registering