Yeah, I think it may be too early to decide on merging, and would be better to start agreeing on the design spec. But then again, it may be prototypes that help refine the design spec. We may not forsee certain classes and hierarchies until seeing prototypes. I updated the class-list in infamous/requirements.