Restructuring the way I store the current drawing