Actually made previous commit's code work.  Damn that logic was wrong.