How to get a lie in?

We seem to have managed most things with our sons development so far, I think.

On weekdays we make use of a nightlight / clock, which lights up at 6:30am, which means he can come into our room.

However on weekends, he still comes through at 6:30, I guess we could change his clock, but we always forget.

How did you guys solve this problem?

Toy boxes / storage, ever increasing

Before Christmas we ordered a second toy box for our monkey, he had one for his Thomas trains etc. We were having the downstairs decorated and decided that the current box worked OK and a second might help keep the place tidy.

In hindsight we'd have been better waiting until after Christmas day as we have more toys that we have space for.

The box we bought was from argos, its a wooden flat pack thing.
Initially I though I might just get some bigger bits of woods and re-engineer the box to make it bigger.

I think sectioning it might help too, as every time he wants to play wit his Thomas stuff he ends up taking everything out to find the piece of track he wanted.

His birthday is in February and I know we may end up in a similar state again.

What do you guys do about toy storage?

His second box is mostly cars all of which he loves.