Reorganized word decision making, added TODOs