MOAR REFACTOR
Remove now-redundant spec
Refactor and testing
Tweak
Merge branch 'factory' into feature/file