Add node to ubuntu provision, and refactor