It all works, now just need to remove vestigial delegate junk.