* WIP hooking up key changes * Fix import cycle, get tests passing and binary compiling * Linting and update whitelist