Start of major refactoring.
Test parameter extraction.