Add some options to the base_builder

Sad that there's more code - hopefully it's not too rought