better method name
Also a better name
Cleanups
More cleanups
More cleanups
Add tests for missing terminators
Add huge test