Fluent restructure

This change supports 0-7 result sets in one command.