Redid collector to new spec

Dropped the analog encoder and servo for a jag