Token based auth work in progress