mostly working build baron plugin
a tad of refactoring
a couple of unit tests