API/DAO almost completed