Got rid of the extra Login class