Turned nodefactory dicts into classes
added intermediate version of circlernode and tests