retooled factories and added gitshoes