More_Shelves

I commit a lot, because my sync connection has been breaking before I'm
done.