Merge Cheng's API

This forms a working underlying base which can be used for 2013 and 2014 robots.