Starting main development towards OAuth integration