Then I realized there were fatal flaws in the previous commit...

So I fixed them...