Minor state object refactor (low priority)

Adding property current_capacity - this is in an attempt to make my future Auto-483 PR smaller.

Edit:  Eh, after further discussion this would not actually improve my pull request.  Please ignore for now.