WIP - Non dtc operations

Just to get the build going and allow for easier code reviews