Fixed TODOs.  Now to fix figure placement.
Positioned the figures.  Now to fix those references somehow.
Aaand this appears to be done now.