Try to clean the if statements up a bit.
EOD Tue the 4th. Working with Tim.