Nearly done getting through turnout mechanism rewrite