Switchyard

Please push it after #104