New class for fit shapes.  Working template fit for mbl distribution.
Cleaned up code.