Experiment with a builder syntax
Resolve merge conflicts