Added some features.
Threw away some pointers.
Brought back the helper.