removing templated stuff, adding node stuff