first refactor
changes to supper master.js refactor