Ubo appears to be working. Large buildout of UBO support. Some changes to VAO.