Both 1-D and 2-D fits seem to work now. Next steps are to track the outputs of multiple fake fits.