Eric 2

I haven't touched this project since November, and even then I was hard pressed to start it. Hopefully I'll make headway soon.