Major P2

Finished conditionals