Verified that everything works fine. Going to merge Gabe's new commits
and start working on kernel integration of the new ERT-based design.