Engine implemented and a lot of cleaning up ...
Main changes
Merge branch 'denny' into dev