nodes now functional!
merged with fish code
whoops, now actually merged
merged master with hans branch