Add johnnyt.pp and beef up site.pp