wip: adding atoms and blocks