Initial rough SS compatible implementaiton