I took a bit on this one because I wanted to back and fix a couple of mistakes