moved states to a more generic 'Units' structure