Experimental work

Experimental work done to make implementation of NQPS easier + make it API stable and rather easy to use for developers.