Added a lot of stuff again

More stuff, trying to get things to render.
Perhaps one day.