Removed adopt for non-logged in users, updated todo