Done fork. Removed OAuth