Yes, very likely it would need reorganizing this (I just copied a bunch of code which I didn't want to change (yet) to separate class)).