Started work on token authorization