Working on hotness in prep for patch
Starting on v2