Made hooks sort across parents, updated TODO