Added new rendering code. Now with improved organization and using glm