Added a possible state to test code, updated TODO list