Lots o' Bugses!

Screwed up the entire logic trying to fix the previous one!