Add more states to units and include state in master view