WIP Seastrap updates