Subtitutions

Does not compile, but want to have the version in the history.
More changes

This compiles, but doesn't run correctly (data passed to OpenGL is in
double, which is wrong).