At this stage of refactoring, yes but I want to bring it back, but with a bit cleaner approach... (I hope)