wip
Add new dependency
WIP
More wip
more wip and comment out debug
Minor fixup