Add //TODO - Logging in