Shape moved out in a separate header
Shader switch implemented
Performance measurment thingies added