Added encoder stuff that isn't whack