GREED in progress, make new branch to work on refactor?