Rewrite to use helmsman