Final commit, done with 5 use cases