1) Added username pass
2) Finish JavaDoc comments