start to add classes for state, bg fill