Initial push to make mobile work without redirect