Massive commit again - vision now works most of the time, ask me to
explain more