Bleeding edge updates

Lots of work; please review