318 Idle issues

We've found some issues. I'll let Colin update when he gets a minute.