Added some basic node stuff and updated RM