Fixed GetNParameters.  About to change naming converntions.
First go of changing naming conventions.  I may have ruined everything.