Better re-arranging of the init/draw stuff for scalability.