M4 changes + toroplus data overlay

TP overlay in phase 0 testing