Continuing from the concept I posted last time, I've now gone ahead on the modeling part. Still lots of optimizing to do, but these are the parts that will be included. I got some triangles to spare, but I hope after the optimization that I'll be able to put in some extra things.