Committing this work, need some extra eyes on it. @EJEHardenberg can you take a look?