Almost did not see this come back up. 

[@Valor]

I've reworked the detection thing on the CS to a point which will hopefully be more acceptable. Still cleaning it up a bit though and adding stuff into the misc/other section though. Want me to post it here when done or should I wait till after the check?