Fleshing out the engine a bit more