Fiddling with builders
Fiddling with builders
Cleanup of code
Added some tests