add better parameter support and testing