Starting work on RM976 and added tests