Many improvements to base class

Add makerbot