More connected texture work. TODO: finish connected textures. Refactoring