Freezing development on this for now, will refocus on this branch later.