API complete. Need testing