Refactor story bootstrap

More of the more of the same.