Cleaned up ls and updated TODO.