Engine WIP.
Engine finished, pulishing on the way.
Fix conflicts