Missed this one when I cleaned this up. As you can see from the number of commits this was a lot of hack and slash before I got something that worked.