Now works on both devices

Not going to push until I redo the weather calls for the intro (so that it doesn't crash android)