some errors with the datafidelity and plotting, but otherwise making some progress