Parameterizing, making this not suck
New docs