Changes made to start making use of the new API

Signed-off-by: hjan <hoeppner.jan@xurv.org>
Merge remote-tracking branch 'origin/master'

Signed-off-by: hjan <hoeppner.jan@xurv.org>

Conflicts:
	pqpickup.user.js