derp refactored and fixed
double derp, forgot ampersand :/