Merge pull request #10 from zagortenay333/expo-mode

Reworked the expo mode!