Added a couple more basic if/else statements