Good call on the new engine. You just saved yourself alot of headaches. You'll definitely enjoy sailing more than cursing out an old engine. You look really motivated and productive. In my opinion working on them is alot of fun, so long as it doesn't turn into too long of a project. I bet it's nice to have help from the deckhands cleaning up the cabin.
