Class Parameters, Performance tuning

This is a new pull request for class parameters and performance tuning, this time based on the correct origin.