Started working on states