Not and or

Should probably review commit by commit.

Agile planner ticket:

https://www.agileplannerapp.com/boards/105200/cards/8757