We're passing in the `system_id` as both the system id and the system name here. Seems odd. Should we be grabbing the name from somewhere else?