Putting the rest into todo state for now