Second version with initial use cases fulfilled