First implementation of builders
TODO updates