Interim commit on work on implementing new drawing