Started restructuring that is needed for NSQ's options to parse properly