First Use Case fully done
Resolve merge conflict