Commenting new code
Merge branch 'mf-refactor' of github.com:variations-on-video/hydrant into mf-refactor