More updates; still WIP.

More updates; still WIP due to odd initialization.  Need to talk to the
prof.