Minor state object refactor (ready for review)

Adding property current_capacity - this is in an attempt to make my future Auto-483 PR tinier.