Wayfinder - Rewrite coding