Work on textures
Add textures
Fix rebase errors