Slight re-factoring
Added AND, OR and NOT to conditionals