Added some stuff, working on making rules through UI