Huge engine change

Engine change in the work.  Sneak preview.