WIP Mlp finishing touches

Slight update to #3204, putting on the finishing touches.