Refactor and inclusion of Vision from Chris P