Added a TODO so I do not forget this new/better system I have in mind