Fixed hierarchy and added blinkalive call to initial WaitButton routine