some groundwork, undone the read only improvement, since it's not applicable