Finish implimenting API functionality