starting back at master, refactoring variables