My father-in-law passed in 2016. I am the executor. We also closed probate in 2016. He had income in 2016 prior to passing. I think I need to file a 1040 for the time he was alive, and a separate 1041 for the estate income & expenses for the time after he passed through the close of probate. Is that correct?