Adding logging, flushed out initial bugs
Added name to nodes