in the process of cleaning up drawing demo. significant progress has been made, but it's not done yet
