Merged into develop (still working on userVerify())