Working on fixing drawing code.