Testing save and return and almost done