Uvs ready to be merge

Oh! If we're not using them right now then that's a simple solution too