Done and double done.

I also added the blank spots that have yet to be filled so that people know that there is space left.