Updated for new mappings, some features are slowly starting to work again. Still a lot of work to do.