[WIP] Split up Builder