Added states, made them badges