Reverted to single module.
Test works, but needs tweaking on handling node objects.