Add basic engine model
Update engine model
minor tweaks to engine model