[broken] Progressing in drawing code refactor