Ummm, never mind about that whole other design thing. The detection code is a little screwed. This is because I suck....