Proc dev refactor

Pull this refactoring into the main branch.