VE-115

**DO NOT MERGE, IN PROGRESS**