shifts function location for easier testing.
Merge pull request #22 from birkin/master

shifts function location for easier testing.