Finalized and tested Builderclass, push back into main pkg