Added in the rest of the if statements

Manually added in all of the if statements.
Hi to myself :)