Updating to the new twitter API, still needs work