[NOT READY FOR MERGE] - Logic expressions

The PR is in progress...