basic ordering fixes #6, optional localsotrage for credentials