Sam prepped this for hand in (no debug msgs)