No to both
I only had a few hours the other night to pack up the "sebring and SPA" ones, plus i had a few bits of packaging left over.
The rest need bundling up . And i haven't had chance to go back to the shop to get more.
I am away on holiday on Monday, straight after nights at work, and return straight back to work, so wont get another chance for at least 2 weeks.