We should probably put some heads together before engine refactor work begins in earnest.