Fixed undefined objects and other bugs trying to get execute to work again...