Initial cut at doing per-state