More work on the builder, some new classes and tag support.