Implemented and functionality
Need to do some rework to make it possible to implement OR