Finish my 1st iteration use cases