Experimental refactoring...