Working on credential checking
Merge origin/master
Misc testing