Has not finished during class. Will finish today. 

Do not know the due date, so I will put current progress for pull request.