Making cuppy into a module and adding generic separation, more instances, etc.