Cleaned up logic and added ability to force the engines on