Readded the Oasis, however it still needs some work (once we go over everything)