Added the terms we have decided to track and some tweaking with the event loop so we can exit execution .. still a bit dodgy