just moving code around
Created attachment 445973 [details] Patch
Created attachment 445975 [details] Patch
went with a different approach