WIP -- restore kind pass, have to cut it down
wip -- remove many parts of kind.rs, still not 100% sure about this
wip -- working on small fixes
wip