cleaned out master while waiting to merge in refactor