New tax client's prior year (2017) Individual Federal and resident state return were filed by someone else.  I was preparing taxpayers 2018 Individual returns and discovered some PY errors and that a non-resident state return had not been prepared at all (taxpayer received State K1 and does need to file the state return).  Before preparing the 2018 Federal, resident and non-resident state returns I wanted to amend 2017 federal and resident state returns and file the original nonresident state return.  Can I do this at one time?  Or do I need to file the amendments and the original non resident return separately?  if separately, how do I do that without being assessed rep fees more than once (I know and understand there is another fee for the extra state return).