Let me think how to accomodate this with a better design now that I have a more clear idea