Added texture mapping, needs cleaned