Engine
- some architecture improvements, will expand on that later