Tons of cleanup and implementation with MBM