Just fixed a derp in my if statements... Still got more to do but too
busy to work on the code for now...