Revert "Broken state, no rendering, bugfix needed.."

This reverts commit 2306b7ecc372d5737ad6b43c141b8d353eed47c2.
Revert "Still issues..."

This reverts commit afdff4fe54d020a417861c471fe03cec7ec3f0cb.
Revert "Still need to handle systems where opengl is below 3.3 and the subsequent glsl discrepancies"

This reverts commit e16c49514cfae74830e4c1c515304ec5dba86dff.
Not perfect, but in a working state at least