Started work on adding enums to VD