Working 1-D model!

Finally got this model working after a bunch of changes.  Will further
clean up and tweak soon, but just wanted to get a working version out
there.