WIP refactoring progress with write tags