[Kelvin/James] #59 Refactored vision facade