Added params and test_params...not finished