I'll make a separate PR to move the save method and we can continue naval-gazing there.