EG: wip removing state (read/write)
EG: refactored code; ALL tests succeed!