Checkpoint...
Some more work in preparation for the actual rendering part...