The other thing that's grabbing the system state is checking if it was specified or not; don't we want to do that here?