First pass at VS support