Updated to a working version, once arguments filled in.