Added 'if's, plus equality and inequality functions