Code changes off of functional base
Removed TODO. Multiple values should work by using multiple parameters with the same key
Edited todo comment to be more informative