[WIP] Marriable Aboard amends