Switched to maven
Added p,q l/r resolving checks