Changes based of convo with Phil Trelford. 

Rearranged the static parameters and updated docs and test to work as well.