Engine rewrite.
Engine changes 1/2