Node

merging tom's changes into my UI branch