Updated waiting model on scruffy main so it no longer blocks