Implemented 100% of the 0.3.2 API