getting closer!
small refactoring to remove redundancy
gradient isn't right, but maybe it's just BP being annoying?
undoing some things.