Moved things around and change a couple of names
Addd check for WIICAMERA