Beta 2.0 - started adding advanced rules UI (not working at the moment!)