Move everything to subclass of Node