worked on friends stuff, removing/adding works correctly now