Adding todos, fixed check changes states
Moving Sql string to helper files