Revised proposal with use case shit