Back in 2001, I was given a ThinkPad A20p which had a hot swappable DVD drive that could take an extra battery or I believe an extra HD. You could also replace the main HD with the removal of a single screw.
Good machines, those IBMs. Their designs were (are) hideous, but in a way rather charming!