More collector work

Was able to get everything that Evin told me to do done except the
SmartCANJaguarSeries stuff