Modified All list & stuff, some todos added