pull-request-247

@shinnlok passing these thru ,still reviewing the Auth stuff