For real this time, no fakesies! Recreated workk from before and
generally improved Factory skeleton
Fixed (calling) errors and a rogue tab
random test to check git working (argh)