Frack yes!

I think this program is pretty much done.

Ran/tested Pippa's code from previous commit.