Implications of Battery and Gas Storage for Germany's National Energy Management