Almost done, adding params