All API functions implemented, testing in progress