Pervious commit message a little optimistic. Not passing Functional tests yet. Going to dinner now.