I've been thinking about that, I just went with something simple to start, but I think you're right, at some point this will need to be separated.