refactored, all math happens in node calculator now