Adding some more organization to the madness