Slight refactor
PIR2 - debug
Conflicts:
	pir.py