Added more code, still doesn't do Password check though