Updated Engine

Updated engine up until resolution of datetime triggers.
Finished Engine, Ready to combine

Finished Engine, Ready to combine