Working through interrupt issues