Merged and updated texturing. Working on collisions.