Refactoring/funcspec

Merging in present state of FuncSpec refactoring in prep for new workflow