starting to fix borked shunting yard implementation