Got factory working, and now actually checking it in