initial version of custom authentication implemented
resoving merge conflict