WIP more progress on ORM, but... locking issues?