[WIP] pushing changes to crew class for nomoon