Trying to get this back to what it was this morning before the wierd merge stuff. I think this is it.