vid-891

DO NOT MERGE, wip