Added in more of the old keywords along with the TODOs required to make them work