Atom build wip