Reorder some logic to work.  And it does work!