Refactored to box values and added logical operators
Added support for variables
Added quoted strings