Commit after working on node addition and removal. Does not typecheck yet