Adding parameter picking code
Merged changes from first public copy with new work (parameter picker)