Vid 2017

Eh, I try and avoid passing by reference unless I have to. It feels too much like a side effect to me. When this is called in VideoHandlerController it's clear that it's returning a value. Maybe a different name would make it more explicit?