More work on else if statements