Started working on complete state handling