Added some c-stick code, and cleaned up most of the code