Started commenting. Added texture mapping
Commiting merge results.
Found error in merge.