Added dynamic lighting, not sure I like it
Changed branching of classes