Matt

Updating branch with move of functions to their own file