Adding and,or,not statements.
Merge
Moved headers to a different class file.
Merged