Pass target to custom detach methods
Fill in TODOs