Towards a complete state

Towards a complete state