Here is a new version. I think I am pretty much done with the modeling so I can get all my attention to lights and textures.