big massive update in prep for something crazy