couple of changes to make it work like I think it should... Jon, let me know if this is what you're going for