…and refactor engine a bit