General: Cancun Pid Check Location

Move Pid checking to Cancun class instead of main
Merge branch 'master' into craeg