Heavy updates to all the things