VID-718 commenting user facing code until it's hooked up