More updates, but still WIP.

WIP because model is blowing up within the first few time steps (Lab 2
only; Lab 3 works perfectly.  Must investigate this weekend and get the
prof's help if possible.