Removed everything and added textures
Misc
Conflict Fixes