Trying to get heat maps working - I also moved some stuff around