Updates to make gmail work, still hardcoded though