Finished new formatting, tested with valid creds, tested with invalid creds