API done, working on builders, removed a todo in builders