massive changes to get basic PoC working