Preliminarily done, need to further change storage of password etc.