Huge amount of changes to handle the first bit of turnout code