All features is finished, need to do todos