check in current version / comment out new drawing concepts for now.