Dev: now uses shaders
Merge branch 'development'