RC Deckhand pt 5

* Let's hope this fixes the issues now