Merge in login class